From f5c842bf6364541151923d488211ec1bc50d25e0 Mon Sep 17 00:00:00 2001 From: Eric DeVolder Date: Wed, 19 Apr 2017 16:01:49 -0500 Subject: [PATCH] xen/kexec: remove spinlock now that all KEXEC hypercall ops are protected at the top-level The spinlock in kexec_swap_images() was removed as this function is only reachable on the kexec hypercall, which is now protected at the top-level in do_kexec_op_internal(), thus the local spinlock is no longer necessary. Signed-off-by: Eric DeVolder Reviewed-by: Bhavesh Davda Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Daniel Kiper Release-acked-by: Julien Grall --- xen/common/kexec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index d6568e3bc6..fbca8a6499 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -820,7 +820,6 @@ static int kexec_exec(XEN_GUEST_HANDLE_PARAM(void) uarg) static int kexec_swap_images(int type, struct kexec_image *new, struct kexec_image **old) { - static DEFINE_SPINLOCK(kexec_lock); int base, bit, pos; int new_slot, old_slot; @@ -832,7 +831,7 @@ static int kexec_swap_images(int type, struct kexec_image *new, if ( kexec_load_get_bits(type, &base, &bit) ) return -EINVAL; - spin_lock(&kexec_lock); + ASSERT(test_bit(KEXEC_FLAG_IN_HYPERCALL, &kexec_flags)); pos = (test_bit(bit, &kexec_flags) != 0); old_slot = base + pos; @@ -846,8 +845,6 @@ static int kexec_swap_images(int type, struct kexec_image *new, clear_bit(old_slot, &kexec_flags); *old = kexec_image[old_slot]; - spin_unlock(&kexec_lock); - return 0; } -- 2.30.2